Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 25 Jan 2010 21:57:27 +0000 (21:57 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 25 Jan 2010 21:57:27 +0000 (21:57 +0000)
commit39c27a4ecd40f18b3a16d2b569038e89142249a9
tree00a703c824796e3950d7ebb0f7be51a96f6c97d8
parent6484b72af610891795122951f8e23160aa28bdb0
parent56afe394f419cf1800bcdc33f746f870939bfa75
Merge from mainline.